extract packaging changes from 4.9.13-1+rpi3 (5ad499885f6dc06a4eef5e2efbfd8504f53a2672)

diff --git a/debian/changelog b/debian/changelog
index 751b226b6a4784f727f11753792d8a5d429f0a2b..1f0d08e3291a2db635f53081f38268a03809603c 100644 (file)
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,10 @@
+linux-4.9 (4.9.13-1+rpi3) jessie-staging; urgency=medium
+
+  * Fix "linux-compiler" packaging stuff for compiler version change.
+  * Remove usbip and cpupower binary packages as they are unversioned.
+
+ -- Peter Michael Green <plugwash@raspbian.org>  Thu, 18 May 2017 17:44:34 +0000
+
 linux-4.9 (4.9.13-1+rpi2) jessie-staging; urgency=medium
 
   * Make config changes based on diff between rpi-4.4.y and rpi-4.9.y branches.

diff --git a/debian/config/armhf/defines b/debian/config/armhf/defines
index 78370e3ef6e23af0f1054541ef8438aea596e968..0f35edad2c029d7011213bbceeffcf7ca7ace231 100644 (file)
--- a/debian/config/armhf/defines
+++ b/debian/config/armhf/defines
@@ -12,7 +12,7 @@ vdso: true
 install-stem: vmlinuz
 
 [relations]
-headers%gcc-6: linux-compiler-gcc-6-arm
+headers%gcc-4.9: linux-compiler-gcc-4.9-arm
 
 [armmp_description]
 hardware: ARMv7 multiplatform compatible SoCs

diff --git a/debian/libusbip-dev.substvars b/debian/libusbip-dev.substvars
new file mode 100644 (file)
index 0000000..abd3ebe
--- /dev/null
+++ b/debian/libusbip-dev.substvars
@@ -0,0 +1 @@
+misc:Depends=

diff --git a/debian/linux-cpupower.substvars b/debian/linux-cpupower.substvars
new file mode 100644 (file)
index 0000000..abd3ebe
--- /dev/null
+++ b/debian/linux-cpupower.substvars
@@ -0,0 +1 @@
+misc:Depends=

diff --git a/debian/rules.real b/debian/rules.real
index 21a2f325ee9a6acdaa273356291e1bccf746c5ae..30626dc2a850355d4b0833f7e8cd2eb563d4462b 100644 (file)
--- a/debian/rules.real
+++ b/debian/rules.real
@@ -74,7 +74,7 @@ binary-indep: install-support
 
 ifneq ($(DO_TOOLS),False)
   build-arch-arch: $(STAMPS_DIR)/build-tools
-  binary-arch-arch: install-kbuild install-usbip install-cpupower
+  binary-arch-arch: install-kbuild
 #  binary-arch-arch: install-liblockdep
   ifneq ($(filter alpha amd64 arm64 armel armhf hppa i386 mips mips64 mips64el mipsel powerpc powerpcspe ppc64 ppc64el s390 s390x sh4 sparc sparc64,$(DEB_HOST_ARCH)),)
     ifeq ($(filter nopython,$(DEB_BUILD_PROFILES)),)

diff --git a/debian/templates/control.extra.in b/debian/templates/control.extra.in
index b0f3e86252a4ed0c60be47ca49b839c74f83f898..1067de796df71ebf07404ffd375ace618ff9620f 100644 (file)
--- a/debian/templates/control.extra.in
+++ b/debian/templates/control.extra.in
@@ -1,24 +1,24 @@
 Package: linux-compiler-gcc-6-arm
 Build-Profiles: <!stage1>
-Depends: gcc-6, ${misc:Depends}
+Depends: gcc-4.9, ${misc:Depends}
 Architecture: armel armhf
 Multi-Arch: foreign
 Description: Compiler for Linux on ARM (meta-package)
  This package depends on gcc 6 of the appropriate architecture for
  Linux on armel and armhf.
 
-Package: linux-compiler-gcc-6-s390
+Package: linux-compiler-gcc-4.9-s390
 Build-Profiles: <!stage1>
-Depends: gcc-6, ${misc:Depends}
+Depends: gcc-4.9, ${misc:Depends}
 Architecture: s390 s390x
 Multi-Arch: foreign
 Description: Compiler for Linux on IBM zSeries (meta-package)
  This package depends on gcc 6 of the appropriate architecture for
  Linux on s390 and s390x.
 
-Package: linux-compiler-gcc-6-x86
+Package: linux-compiler-gcc-4.9-x86
 Build-Profiles: <!stage1>
-Depends: gcc-6, ${misc:Depends}
+Depends: gcc-4.9, ${misc:Depends}
 Architecture: amd64 i386 x32
 Multi-Arch: foreign
 Description: Compiler for Linux on x86 (meta-package)

diff --git a/debian/templates/control.tools.in b/debian/templates/control.tools.in
index 735c88c82eddaed4abe1fec70eaa582d4917cb68..c3cf0bb5e7506dd9570cf1131bf2601b0a97a948 100644 (file)
--- a/debian/templates/control.tools.in
+++ b/debian/templates/control.tools.in
@@ -6,37 +6,6 @@ Multi-Arch: foreign
 Description: Kbuild infrastructure for Linux @version@
  This package provides the kbuild infrastructure for the headers packages for Linux kernel version @version@.
 
-Package: linux-cpupower
-Build-Profiles: <!stage1 !pkg.linux.notools>
-Section: admin
-Architecture: linux-any
-Depends: ${shlibs:Depends}, ${misc:Depends}
-Description: CPU power management tools for Linux
- The cpupower command allows inspection and control of cpufreq and
- cpuidle tunables for hardware that support these features.  It
- replaces "cpufreq-info" and "cpufreq-set" in cpufrequtils.
- .
- ${cpupower:Arch-Description}
-
-Package: libcpupower1
-Build-Profiles: <!stage1 !pkg.linux.notools>
-Section: libs
-Architecture: linux-any
-Depends: ${shlibs:Depends}, ${misc:Depends}
-Description: CPU frequency and voltage scaling tools for Linux (libraries)
- This package contains the shared library.
-
-Package: libcpupower-dev
-Build-Profiles: <!stage1 !pkg.linux.notools>
-Section: libdevel
-Architecture: linux-any
-Depends: ${shlibs:Depends}, ${misc:Depends}, libcpupower1 (= ${binary:Version})
-Provides: libcpufreq-dev
-Conflicts: libcpufreq-dev
-Replaces: libcpufreq-dev
-Description: CPU frequency and voltage scaling tools for Linux (development files)
- This package contains the 'power/cpupower' headers and library shared objects.
-
 Package: linux-perf-@version@
 Build-Profiles: <!stage1 !pkg.linux.notools !nopython>
 Section: devel
@@ -54,40 +23,6 @@ Description: Performance analysis tools for Linux @version@
  The linux-base package contains a 'perf' command which will invoke the
  appropriate version for the running kernel.
 
-Package: libusbip-dev
-Build-Profiles: <!stage1 !pkg.linux.notools>
-Architecture: linux-any
-Depends: ${misc:Depends}
-Section: libdevel
-Description: USB device sharing system over IP network (development files)
- USB/IP is a system for sharing USB devices over the network.
- .
- This package provides headers for the libusbip library and
- the library itself for static linking.
-
-Package: usbip
-Build-Profiles: <!stage1 !pkg.linux.notools>
-Architecture: linux-any
-Depends: usbutils, ${shlibs:Depends}, ${misc:Depends}
-Section: admin
-Description: USB device sharing system over IP network
- USB/IP is a system for sharing USB devices over the network.
- .
- To share USB devices between computers with their full
- functionality, USB/IP encapsulates "USB requests" into IP
- packets and transmits them between computers.
- .
- Original USB device drivers and applications can be used
- for remote USB devices without any modification of them. A
- computer can use remote USB devices as if they were
- directly attached.
- .
- Currently USB/IP provides no access control or encryption.
- It should only be used in trusted environments.
- .
- This package provides the server component 'usbipd' and the
- client tool 'usbip'.
-
 Package: hyperv-daemons
 Build-Profiles: <!stage1 !pkg.linux.notools>
 Architecture: i386 amd64 x32